Finally scales correctly
Resolved conflicts
Merge pull request #168 from benrudolph/logoviewlove

(#161) - Logoviewlove Fixes a lot of the issues with LogoView
Updated filter and color activity layout for small screens
Small bug fix with color activity
Merge pull request #170 from elihart/publishButton

Layout fixes