fix little bugs 5
fix layout