Fix tabs
Dynamic backgrounds
Fix merge conflicts