added users to #11, no more layout bug to close #7