Ported to API 20 and implemented several layout improvements