fix styles and update to latest way of handling thing