Improve details in layout