Update UI
Remove redundant code
Minor change
Prepare for push to market