Views modifications

Fixed after prior issues. Hopefully.