Layout added. Many markup and angular fixes