layout + crash fixed - finalized UI