FE tweaks
refactored things