Lots of design changes using Bootstraper