Reorganised code and added font