Some layout improvements
TODO: Manage request errors!