refactored css code
added 'new-password' page
fixed merge conflicts from development branch