Added helper tools and fixed single view controller display bug