fix some layout related issues

Signed-off-by: Arnav Gupta <championswimmer@gmail.com>