Code improvements and settings Activity title change