Fixing buttons, adding a button and chat