try fix layout a bit. Basically done