Improvements on buttons and aside