Mega redesign application (part 2)