Change guest section layout

Issue #14