Added frontend for user. Added Some improvements