refurbished the layout a little bit