Fixing UI bugs, adding marketing panel