Modifications to Add User layout, darker theme
Code cleanup.