Adding switches for CSS behavior, improved styling to conform with Android styleguide