Modularizing and adding new logo