updated layouts and directives
updated styles and code