Updated to fix spacing/layout issues