Fixed Layout errors, Base64 still throwing decode errors