finishing up basic layout