Fixes to base theme

Did some fixes on the base theme