Added stub for the activation of automatic grid layout on startup
Minor code cleanups