Changed the basic design for a more clean  / fresh one