Tidy up display and fixed layout