cleaning up ui and fixing topic names