Added new phase and reworked layout