Some code cleanup and new GUI images