Added first version of code for screens
Minor alignments of location-element
Layout fixes