fix user model and main layout