better layout. some tweaks