Adding more controls
Still working on hiding cells