Fixed render bugs and added controls