ADd collapse, transition and improvements on UI theme