Some cleanup, buttons here and there...