minor refactoring
remove test
added autolayout