Finish styling and functionality changes