Fixes to admin and main page