Fixing issues with the layout that appeared after last merge