Fixing some issues with the default theme