Added back in our changes. Added right side button stuff back in that original author had removed.