some changes in presentation layer and minor bugfixes :D