Modal added and lots of design changes