Fixed View Selection and other little bugs