finish functionality
fix button color
fix user update