Yep, move Xtal closer (as close as physically possible) and move decoupling caps as close as possible too.
Also, we might as well learn you some PCB layout right now... Avoid those 90-degrees bends, they can be a problem when etching, and even give you problem if your circuit is high speed (RF-circuit)
// Per.