re-arrange, favicon, and some order