Update dependencies
Improve layout structure