Improve design, add 404