Add work and fix styles