Linked Login and Welcome activities

Also cleaned up the interface of Login to match Welcome