Fixed issue 44

Test on setup screen in bigger layouts