Fix layout
Update theme