Merging Front end

:)