Layout improvements and general formatting