Merge pull request #25 from elyas-bhy/develop

UI improvements