Add better views and functional tests