start of redesign and bootstrap 3
fixed merge