update to the functionality and a few styling updates