Added Lock and mark as resolved and corrected css