Added watcher functions and fixed layout