Added a bit of design