improved layout

#fno-148 in progress