Removed styling from templates. Cleanup