changed questions a little and made things more visually appealing
merge