updating to more angular-like layout.