Slight layout improvements