Changed the design a little