Fixed some problem with layout on Win8