Code

improve layout