Added uniqueness constraint to marking tables, improved looked and feel