Amer's changes + fix layout overflowing