Setting screen is done. Minor bug fixes