Removing button and put them into navbar