Fixed bugs - Aspect ratio and switch views