Add functionality and minor styling