Modified Spring Classes
Updated UI
Fixed Angular Issues