completed button swap when on different view, minor layout updates