Polished layout to be correct size for main components