Design edits by Jovan