Last revision of the night

Minor fixes
Buttons and stuff almost finished

One step closer to the final, merging is still on the works