Some changes to the main storyboard and fixed bug