a few design changes
expanded look