Updated Table View with new layout