Added the front end with proper structure