Changed the design a bit more