Change the markup to fit translation option
Place functions in correct place
Compact files