Minor gui updates
/announce and big refactor