Utilize widgets, improve style integration