Updated design (currently partly without functionality)