Tabs update when switched, gadget price added to value
Merge origin/master