add font-awesome, improve alignment and style
merge