Disabled timer, 
and added orientation detection