Small fixes to make things work...
First start on css-based interface