Cleaned up layout