cleaned up layout structure