More frontend fixes/changes, a little refactoring on views