Corrected layout issues related to #329