Bug Fixes
Fixing Front display