Improve UI

Mix control with content