some more layout changes. unfinished