more divs and cleanup
more ui class work to help make reusable code