Pushing some UI design improvement.
Cleaned MainActivity a bit.