several Intents and some views code changed