cleaned up basic layout