Improve layout
Change version