Fixed comments and created option menu