fixed less compiling and layout bugs