Improve design, add static genres and battle modules