Fixed bug with layout