Updated name of the primary demo activity
Cleaned up code formatting and style
Updated demo activity layout name and introduced margins