Skin and text updates
Code cleanup and header update
Code cleanup and comments