Change options for better default layout
Comment a function in Controller which purpose is not clear (for me)