refactoring
fixed portrait
fixed portrait  -  but landscape broken