UI update, fixing styles and controllers