Better layout, remove evil_icons