fixed login logout issue
fixed user setting page with template folder
changes in websites page
merged
css changes