Slight layout improvement