polish layout
238 - FIx bug on front-end interface