Fix few markup panel inconsistencies; better ToS and registration