Fixed button placement bug