Rework done

Looks a lot better now