Fixing the issue with layout