Switched to new version of build tools.
Fixed issue with layout.
Moved shared prefs key to final static variable.