This thesis improves the usability of the Communication Application with Geographical Element Data (CAGED) application, an Android application for improved Situational Awareness (SA) at the individual soldier level. CAGED was developed in 2016 as part of a demonstrator in the SMART experiment at the Norwegian Defence Research Establishment (FFI). The experiment investigated how smart technology could be used as a cheap and low-complexity platform for units with limited resources and time for training. The results from the SMART experiment were promising, however they also uncovered several limitations with the demonstrator. This thesis continues the SMART experiment by improving the usability of CAGED. It includes an analysis of the usability requirements for the application and a study of state of the art and related work. The highest prioritized requirements have been implemented, tested and evaluated using both qualitative and quantitative methods through four user tests and one technical test. The new design (called CAGED_2.0) enhances the data visualization, the information architecture, the user interactions and the performance. The results from the user tests indicates that the users are more satisfied with the application after the changes and they seems to agree that the usability has improved. A new geolocatsion mechanism was implemented which uses sensor fusion to save power when the user is stationary. The results from the technical test showed that the new mechanism could save as much as 50% of the power while preserving the accuracy compared to the previous solution.