v0.4.2.1

Cleaned up MainActivity