Fixed issue with layout