User experience improvements
Not final yet...
Merge pull request #1 from berriesapps/ver2

User experience improvements