Fixed bugs - previously used colors, switch views