misc styling updates and optimization