Fix responsive display + clean up