made initial design changes and added modal