Overall UI improvements
Merge pull request #5 from edoshor/captures

Captures