Updated screenshots + minor code cleanup