whitespace cleanup, better sql, label improvements in admin page