improve initial setup layout, fix for mobile