Layout changes, PEP8, download path fix