Improve some layout