fixed layout when guest and simplified commands implementation