Started changing the design

This is still a work in progress!