Some styling changes and offline work arounds