Removed unused file, updated Tab Layouts