Sync

Sync with new layouts, need new class for list adapter as previous was
altered.. easier to copy back the old one as a separate class...