Some more layout work and fixing errors on device