Minor changes to Default and Simple theme