Fixed the factories and added small UI changes