lots of work on ui for main layout