fixes #14 - improving code readability and adding confirm screen for shib associate