Better code, new button placement