Change to Fragment to handle configuration change & minor UI change & comment