Fixed bug in filemanager.java and added some decorations