Layout & style improvements