Work In Progress

Moved icons, work on main form.