Updated bootstrap theme
Added new switch code
fixed display bugs