Added button area
minor improvements