Add ViewSelection and Jims Icon. Some fixes