Improvements on user and layout