More work on Current view