Debugged UI
Merge pull request #80 from andhieka/working

Debugged UI