blue layout

plus small fixes