Some User side layout improvements