Hotfix/layout fix