move things around
update styles