Added layouts changes and made backend improvements.