Updated Table, added different views