Front end changes & refactoring