Incomplete attempt at updating views with proper buttons, displays and links