Changed the Design a bit