Better view management and various improvements