Fixed small issue with layouts