style updates and a UI fixes