Design: improve main interface concept