Login and Table design changes