little less buggy layout