Resolved build bug related to hard coded image locations and more code cleanup