Fixed some bugs and layout: now working.