Fixed continuous, scrubbed whitepaces from db names, updated layout