Removing orientation change handling + fixes for public methods