Some minor Bugfixes and added use of new class to MainActivity