Fixed some layout issues + 2 new themes