Some Cleanup & Added Mashup Button