Console and edit button improvements