More UI changes...will need css/html cleanup