Improved the frontend look and feel