Improve performance and edit design