general layout/bug fixes