enhanced some layout and cleaned up some files