Working on Glass Activity.
Working on Glass activity
Refactoring
merge