Fixed bug top layout