Started adjusting everything for the new design