Refactor ui

The weight should be moved to CSS