Some minor changes

Minor changes, CustomTextView added (nothing really big)