Initial commit
Cleaned up code and adjusted UI
merges