Minor changes
Fixed crash on rotation