full angular + better layout