Starting work on a re-design. I fixed a few inconsistencies beforehand