Adjusted layout + Release Bèta v1.0