Added orientation capability and button