Fixed layout issues, connected DB