add assets management and improve layout
Fix entity selector