some template + css improvements
more error handling