fixed some layout issues, extra </div> from if check