More theme updates, layout adjustments
layout adjustments