New ui

finished layout mock up