refactor properties, fix spelling mistake and auto layout issues