MBH: adding rest of views, file cleanup