Tweaks to UI layout
Put global string constants in java class