refactoring to use snap partial in more places, css improvements to fix loading image screen on browsers