Feature/ronakmdave/main activity work