improved layout
improved layout