Refining the design a bit more to make it more semantic and intuitive. Still needs more work.