Some button placement changes