buttons navigation and some updates