Theme design updated and a bug fixed.