Cleaned up basic layout.