Reorganization, mini icons (only drawing for now..), debug