bug fixes and larger layouts