Doing a little Layout and visual cleanup and data cleanup