another layout try, looks much better now