commit 3: updated layout a bit