Revert "Added new classes and better ui"

This reverts commit 6ef3a26435cff8af42ebeacb434d669a28c1b33a.