merged
login page styling
db settings