Fixing buttons, remove source option