Cleaning up some remaining UI issues and adding the reveal framework to test it