Part 2 of 3: Removed unneeded buttons + segues