active_admin changes and some alignments