Further improvements on buttons and south