Fixing phone UI & Finalizing comment system