Improve icons + layout. Closes #2