Major design improvements and true nesting
New icons