small tweaks, fixed some back button issue