More layout changes

more layout changes
Final before update

Final update
Final

Final updated and working app